From 54a07c6646d18376d663a037554bfe5a2746adcb Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 16 Nov 2009 20:09:52 +0000 Subject: [PATCH] * net/tramp-gvfs.el (tramp-gvfs-dbus-event-error): Raise only an error when `tramp-gvfs-dbus-event-vector' is set. (tramp-gvfs-maybe-open-connection): Loop over `read-event'. --- lisp/net/tramp-gvfs.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 94f6f742017..a04f891b3f5 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -196,7 +196,7 @@ ;; ;; -;; +;; ;; ;; ;; @@ -499,9 +499,10 @@ is no information where to trace the message.") (defun tramp-gvfs-dbus-event-error (event err) "Called when a D-Bus error message arrives, see `dbus-event-error-hooks'." -; (tramp-cleanup-connection tramp-gvfs-dbus-event-vector) - (tramp-message tramp-gvfs-dbus-event-vector 1 "%S" event) - (tramp-error tramp-gvfs-dbus-event-vector 'file-error "%s" (cadr err))) + (when tramp-gvfs-dbus-event-vector + ;(tramp-cleanup-connection tramp-gvfs-dbus-event-vector) + (tramp-message tramp-gvfs-dbus-event-vector 10 "%S" event) + (tramp-error tramp-gvfs-dbus-event-vector 'file-error "%s" (cadr err)))) (add-hook 'dbus-event-error-hooks 'tramp-gvfs-dbus-event-error) @@ -1092,7 +1093,7 @@ connection if a previous connection has died for some reason." vec 'file-error "Timeout reached mounting %s@%s using %s" user host method))) (while (not (tramp-get-file-property vec "/" "fuse-mountpoint" nil)) - (sit-for 0.1))) + (read-event nil nil 0.1))) ;; We set the connection property "started" in order to put the ;; remote location into the cache, which is helpful for further -- 2.30.2